From 89286af62005cadb2bc64c259b03b204366a4d17 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?utf8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Thu, 8 Oct 2020 12:46:06 +0800 Subject: [PATCH] Revert "GDK W32: Use SWP_NOOWNERZORDER everywhere it can be applied" This reverts commit fc2008f2. Turns out, we *don't* have code to maintain Z-order. Restacking code is not doint that, it just enforces a few weird Z-order-related behaviours. --- gdk/win32/gdksurface-win32.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c index 2ef43845b8..9ecbb6dbad 100644 --- a/gdk/win32/gdksurface-win32.c +++ b/gdk/win32/gdksurface-win32.c @@ -1001,7 +1001,7 @@ show_window_internal (GdkSurface *window, API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window), (window->state & GDK_TOPLEVEL_STATE_ABOVE)?HWND_TOPMOST:HWND_NOTOPMOST, 0, 0, 0, 0, - SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOOWNERZORDER)); + SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE)); } } @@ -1927,7 +1927,7 @@ _gdk_win32_surface_update_style_bits (GdkSurface *window) rect.right += after.right - before.right; rect.bottom += after.bottom - before.bottom; - flags = SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOREPOSITION | SWP_NOOWNERZORDER; + flags = SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOREPOSITION; if (will_be_topmost && !was_topmost) { @@ -4260,7 +4260,7 @@ gdk_win32_surface_fullscreen (GdkSurface *window) API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window), HWND_TOP, x, y, width, height, - SWP_NOCOPYBITS | SWP_SHOWWINDOW | SWP_NOOWNERZORDER)); + SWP_NOCOPYBITS | SWP_SHOWWINDOW)); } } @@ -4284,7 +4284,7 @@ gdk_win32_surface_unfullscreen (GdkSurface *window) API_CALL (SetWindowPos, (GDK_SURFACE_HWND (window), HWND_NOTOPMOST, fi->r.left, fi->r.top, fi->r.right - fi->r.left, fi->r.bottom - fi->r.top, - SWP_NOCOPYBITS | SWP_SHOWWINDOW | SWP_NOOWNERZORDER)); + SWP_NOCOPYBITS | SWP_SHOWWINDOW)); g_object_set_data (G_OBJECT (window), "fullscreen-info", NULL); g_free (fi); -- 2.30.2